Auto merge of #3064 - dtolnay:rustc-macro, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 6 Sep 2016 17:46:41 +0000 (10:46 -0700)
committerGitHub <noreply@github.com>
Tue, 6 Sep 2016 17:46:41 +0000 (10:46 -0700)
commitafaffa1cac449f427f6b3a24451362899021ed70
tree34608c3e0f3db3158965fdd8e60d63442503cc9b
parent553e6d1c7d6b011fff64a717da6592d58645776f
parent7ee6f57de1df970c4ea7a46e61339e64fdf12c90
Auto merge of #3064 - dtolnay:rustc-macro, r=alexcrichton

Macros 1.1

Tested with https://github.com/serde-rs/serde/pull/530. This should be able to merge independently of https://github.com/rust-lang/rust/pull/35957.

r? @alexcrichton
src/doc/manifest.md